منابع مشابه
Object-Oriented Identifier Renaming Correction in Three-Way Merge
There are two traditional concurrency models among the source code management (SCM) systems: lock and merge models. The lock model prevents the concurrent modification on the same files, but the merge model allows the parallel editing, and performs a merge to reconcile the changes. A three-way merge engine is a usual part of SCM systems, some of them attempt to auto-merge the files, but sometim...
متن کاملA Fault-Tolerant Three-Way Merge for XML and HTML
Three-way merging is a technique that is used to reintegrate changes to a document when multiple independently modified copies have been made. Tools for three-way merge of ASCII text files exist in the form of the ubiquitous diff and patch tools, but these are of limited applicability when parts of the documents have been rearranged. Our fault-tolerant three-way merge for XML and HTML was desig...
متن کاملHow to merge program texts
Software usually exists in multiple versions. All these versions must evolve in parallel. We propose a programmerging system that helps the programmer to manage the evolution of all the versions, which is much needed in software development and maintenance environments. The system can either combine two programs together or it can combine changes to a base program together. The system consists ...
متن کاملVerifying Semantic Conflict-Freedom in Three-Way Program Merges
Even though many programmers rely on 3-way merge tools to integrate changes from different branches, such tools can introduce subtle bugs in the integration process. This paper aims to mitigate this problem by defining a semantic notion of conflict-freedom, which ensures that the merged program does not introduce new unwanted behaviors. We also show how to verify this property using a novel, co...
متن کاملTalking Your Way into Agreement: Belief Merge by Persuasive Communication
As usually considered in Social Choice theory, the problem of preference aggregation is to find a natural and fair “merge” operation (subject to various naturalness or fairness conditions), for aggregating the agents’ preferences into a single group preference. Depending on the stringency of the required fairness conditions, one can obtain either an Impossibility theorem (e.g Arrows theorem [2]...
متن کاملذخیره در منابع من
با ذخیره ی این منبع در منابع من، دسترسی به آن را برای استفاده های بعدی آسان تر کنید
ژورنال
عنوان ژورنال: Proceedings of the ACM on Programming Languages
سال: 2018
ISSN: 2475-1421
DOI: 10.1145/3276535